Change in osmo-msc[master]: implement CM Re-Establish for voice calls
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25076 ) Change subject: implement CM Re-Establish for voice calls .. Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/25076/4/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/c/osmo-msc/+/25076/4/src/libmsc/gsm_04_08.c@921 PS4, Line 921: * Clear any connections at will. */ > I guess fixing this requires major refactoring and is out of scope for this > patch. […] i think when we receive GSUP for that IMSI during auth then it's a problem to have two msc_a for the same IMSI. Which one should get the response? send it to both would be an idea, then maybe we can overlap the two msc_a until after auth...? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6fa37d6ca9fcb1637742b40e37b68d67664c9b60 Gerrit-Change-Number: 25076 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 20:56:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: allow another reject cause in TC_cm_reest_req_reject
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25109 ) Change subject: msc: allow another reject cause in TC_cm_reest_req_reject .. msc: allow another reject cause in TC_cm_reest_req_reject osmo-msc will soon have CM Re-Establishing support, and it will start returning a different reject code instead of GSM48_REJECT_SRV_OPT_NOT_SUPPORTED. In TC_cm_reest_req_reject, there is no previous ongoing connection let alone a voice call, so osmo-msc will return GSM48_REJECT_CALL_CAN_NOT_BE_IDENTIFIED. Related: SYS#5130 Change-Id: I3eebab2b26016fb0ef7bf958208eaba6ae4c7836 --- M msc/MSC_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/25109/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 740d396..d63e5fc 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1403,7 +1403,9 @@ var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); var PDU_ML3_MS_NW l3_info := valueof(ts_CM_REEST_REQ(0, mi)); f_cl3_or_initial_ue(l3_info); - BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_REJ(int2oct(32,1; + /* Older osmo-msc returns: GSM48_REJECT_SRV_OPT_NOT_SUPPORTED = 32, +* newer osmo-msc with CM Re-Establish support returns: GSM48_REJECT_CALL_CAN_NOT_BE_IDENTIFIED = 38 */ + BSSAP.receive(tr_PDU_DTAP_MT(tr_CM_SERV_REJ( (int2oct(32,1), int2oct(38,1)) ))); f_expect_clear(); } testcase TC_cm_reest_req_reject() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25109 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: I3eebab2b26016fb0ef7bf958208eaba6ae4c7836 Gerrit-Change-Number: 25109 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in osmo-ci[master]: lint: checkpatch.pl: no spaces required for tdef
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/24961 ) Change subject: lint: checkpatch.pl: no spaces required for tdef .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/24961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1f0b9ed5bd49ef9b5ab0e347b9260e71df34ff9c Gerrit-Change-Number: 24961 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 20:50:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: lint: checkpatch.pl: no spaces required for tdef
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/24961 ) Change subject: lint: checkpatch.pl: no spaces required for tdef .. Patch Set 2: maybe we should rather add spaces in the source trees -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/24961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1f0b9ed5bd49ef9b5ab0e347b9260e71df34ff9c Gerrit-Change-Number: 24961 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 20:50:27 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: lint: exclude kdf, milenage for libosmocore
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/24962 ) Change subject: lint: exclude kdf, milenage for libosmocore .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/24962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iccf59d66f35ede9710258faf9d4257584214bb17 Gerrit-Change-Number: 24962 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 20:49:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: lint: ignore LONG_LONE
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25107 ) Change subject: lint: ignore LONG_LONE .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/25107/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/25107/1//COMMIT_MSG@7 PS1, Line 7: LONE long lol -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I88fd86ac550fddb3017aeceb647c3d9e75367372 Gerrit-Change-Number: 25107 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 20:48:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-msc[master]: implement CM Re-Establish for voice calls
Hello osmith, Jenkins Builder, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/25076 to look at the new patch set (#5). Change subject: implement CM Re-Establish for voice calls .. implement CM Re-Establish for voice calls Related: SYS#5130 Change-Id: I6fa37d6ca9fcb1637742b40e37b68d67664c9b60 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/msc_common.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c 5 files changed, 136 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/76/25076/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6fa37d6ca9fcb1637742b40e37b68d67664c9b60 Gerrit-Change-Number: 25076 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in simtrace2[master]: introduce support for new ngff_cardem board
Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/25082 to look at the new patch set (#4). Change subject: introduce support for new ngff_cardem board .. introduce support for new ngff_cardem board This adds support for the new ngff_cardem board, a board that basically combines a ngff breakout board with a built-in SIMtrace2. Cardem works, but depending on the modem it might need a adjusted ATR to ensure a lower baud rate is used by the modem, high rates might lead to weird power cycling of the card after a few transfers. Trace was also tested and appears to work as expected. Change-Id: Ia96124fbe8a752c98e7fd4096d542a3b2b9bc255 --- M contrib/flash.py M contrib/simtrace.lua M firmware/apps/cardem/main.c A firmware/libboard/ngff_cardem/include/board.h A firmware/libboard/ngff_cardem/include/card_pres.h A firmware/libboard/ngff_cardem/include/wwan_led.h A firmware/libboard/ngff_cardem/include/wwan_perst.h A firmware/libboard/ngff_cardem/product_string.txt A firmware/libboard/ngff_cardem/source/board_ngff_cardem.c A firmware/libboard/ngff_cardem/source/card_pres.c A firmware/libboard/ngff_cardem/source/sim_switch.c A firmware/libboard/ngff_cardem/source/wwan_led.c A firmware/libboard/ngff_cardem/source/wwan_perst.c M firmware/libboard/simtrace/include/board.h M firmware/libcommon/include/simtrace_usb.h M firmware/libcommon/source/mode_cardemu.c M host/contrib/99-simtrace2.rules M host/lib/usb_util.c M host/src/simtrace2-sniff.c 19 files changed, 800 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/82/25082/4 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia96124fbe8a752c98e7fd4096d542a3b2b9bc255 Gerrit-Change-Number: 25082 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in simtrace2[master]: contrib: more cardem dissection
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/25086 to look at the new patch set (#3). Change subject: contrib: more cardem dissection .. contrib: more cardem dissection Change-Id: Ia74d3674f854b390c9745a1cb8d5756bd5d39540 --- M contrib/simtrace.lua 1 file changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/86/25086/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia74d3674f854b390c9745a1cb8d5756bd5d39540 Gerrit-Change-Number: 25086 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in simtrace2[master]: introduce support for new ngff_cardem board
Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/25082 to look at the new patch set (#3). Change subject: introduce support for new ngff_cardem board .. introduce support for new ngff_cardem board This adds support for the new ngff_cardem board, a board that basically combines a ngff breakout board with a built-in SIMtrace2. Cardem works, but depending on the modem it might need a adjusted ATR to ensure a lower baud rate is used by the modem, high rates might lead to weird power cycling of the card after a few transfers. Trace was also tested and appears to work as expected. Change-Id: Ia96124fbe8a752c98e7fd4096d542a3b2b9bc255 --- M contrib/flash.py M contrib/simtrace.lua M firmware/apps/cardem/main.c A firmware/libboard/ngff_cardem/include/board.h A firmware/libboard/ngff_cardem/include/card_pres.h A firmware/libboard/ngff_cardem/include/wwan_led.h A firmware/libboard/ngff_cardem/include/wwan_perst.h A firmware/libboard/ngff_cardem/product_string.txt A firmware/libboard/ngff_cardem/source/board_ngff_cardem.c A firmware/libboard/ngff_cardem/source/card_pres.c A firmware/libboard/ngff_cardem/source/sim_switch.c A firmware/libboard/ngff_cardem/source/wwan_led.c A firmware/libboard/ngff_cardem/source/wwan_perst.c M firmware/libcommon/include/simtrace_usb.h M firmware/libcommon/source/mode_cardemu.c M host/contrib/99-simtrace2.rules M host/lib/usb_util.c M host/src/simtrace2-sniff.c 18 files changed, 799 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/82/25082/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia96124fbe8a752c98e7fd4096d542a3b2b9bc255 Gerrit-Change-Number: 25082 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in simtrace2[master]: Introduce simtrace2-tool
Hoernchen has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/simtrace2/+/24574 ) Change subject: Introduce simtrace2-tool .. Introduce simtrace2-tool The simtrace-tool is a command line tool which can be used to e.g. manually request a modem reset. Change-Id: I3a8896ac2b3caef7590b51118359e5caed820a40 --- M host/src/Makefile.am A host/src/simtrace2-tool.c 2 files changed, 335 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/74/24574/4 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/24574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I3a8896ac2b3caef7590b51118359e5caed820a40 Gerrit-Change-Number: 24574 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in simtrace2[master]: introduce support for new ngff_cardem board
Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/25082 to look at the new patch set (#2). Change subject: introduce support for new ngff_cardem board .. introduce support for new ngff_cardem board This adds support for the new ngff_cardem board, a board that basically combines a ngff breakout board with a built-in SIMtrace2. Cardem works, but depending on the modem it might need a adjusted ATR to ensure a lower baud rate is used by the modem, high rates might lead to weird power cycling of the card after a few transfers. Change-Id: Ia96124fbe8a752c98e7fd4096d542a3b2b9bc255 --- M contrib/flash.py M contrib/simtrace.lua M firmware/apps/cardem/main.c A firmware/libboard/ngff_cardem/include/board.h A firmware/libboard/ngff_cardem/include/card_pres.h A firmware/libboard/ngff_cardem/include/wwan_led.h A firmware/libboard/ngff_cardem/include/wwan_perst.h A firmware/libboard/ngff_cardem/product_string.txt A firmware/libboard/ngff_cardem/source/board_ngff_cardem.c A firmware/libboard/ngff_cardem/source/card_pres.c A firmware/libboard/ngff_cardem/source/sim_switch.c A firmware/libboard/ngff_cardem/source/wwan_led.c A firmware/libboard/ngff_cardem/source/wwan_perst.c M firmware/libcommon/include/simtrace_usb.h M firmware/libcommon/source/mode_cardemu.c M host/contrib/99-simtrace2.rules M host/lib/usb_util.c 17 files changed, 767 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/82/25082/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25082 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia96124fbe8a752c98e7fd4096d542a3b2b9bc255 Gerrit-Change-Number: 25082 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Move tbf ul_ack_state to osmocom FSM
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25108 to look at the new patch set (#3). Change subject: Move tbf ul_ack_state to osmocom FSM .. Move tbf ul_ack_state to osmocom FSM Related: OS#2709 Change-Id: Icf23bf5a4b85fbcbf1542cebceb76b9ba7185d30 --- M src/Makefile.am M src/encoding.cpp M src/encoding.h M src/gprs_rlcmac_sched.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp M src/tbf_ul.cpp M src/tbf_ul.h A src/tbf_ul_ack_fsm.c A src/tbf_ul_ack_fsm.h M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err M tests/types/TypesTest.cpp M tests/types/TypesTest.err 16 files changed, 491 insertions(+), 171 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/25108/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icf23bf5a4b85fbcbf1542cebceb76b9ba7185d30 Gerrit-Change-Number: 25108 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Move tbf ul_ack_state to osmocom FSM
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/25108 ) Change subject: Move tbf ul_ack_state to osmocom FSM .. Move tbf ul_ack_state to osmocom FSM Related: OS#2709 Change-Id: Icf23bf5a4b85fbcbf1542cebceb76b9ba7185d30 --- M src/Makefile.am M src/encoding.cpp M src/encoding.h M src/gprs_rlcmac_sched.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp M src/tbf_ul.cpp M src/tbf_ul.h A src/tbf_ul_ack_fsm.c A src/tbf_ul_ack_fsm.h M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err M tests/types/TypesTest.cpp M tests/types/TypesTest.err 16 files changed, 487 insertions(+), 171 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/08/25108/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25108 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icf23bf5a4b85fbcbf1542cebceb76b9ba7185d30 Gerrit-Change-Number: 25108 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-msc[master]: implement CM Re-Establish for voice calls
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25076 ) Change subject: implement CM Re-Establish for voice calls .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6fa37d6ca9fcb1637742b40e37b68d67664c9b60 Gerrit-Change-Number: 25076 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 18:29:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: lint: ignore LONG_LONE
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25107 ) Change subject: lint: ignore LONG_LONE .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I88fd86ac550fddb3017aeceb647c3d9e75367372 Gerrit-Change-Number: 25107 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 18:22:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in simtrace2[master]: WIP: introduce support for new ngff_cardem board
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/24879 ) Change subject: WIP: introduce support for new ngff_cardem board .. Patch Set 2: (4 comments) https://gerrit.osmocom.org/c/simtrace2/+/24879/2/firmware/libboard/ngff_cardem/include/board.h File firmware/libboard/ngff_cardem/include/board.h: https://gerrit.osmocom.org/c/simtrace2/+/24879/2/firmware/libboard/ngff_cardem/include/board.h@42 PS2, Line 42: #define PINS_LEDS PIN_LED_RED, PIN_LED_GREEN trailing whitespace https://gerrit.osmocom.org/c/simtrace2/+/24879/2/firmware/libboard/ngff_cardem/include/board.h@74 PS2, Line 74: //#define PIN_USIM2_VCC {PIO_PB2, PIOB, ID_PIOB, PIO_INPUT, PIO_DEFAULT} Commented out, is it needed? https://gerrit.osmocom.org/c/simtrace2/+/24879/2/firmware/libboard/ngff_cardem/include/board.h@93 PS2, Line 93: //#define PIN_SIM_SWITCH1 {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} Why are those commented, but redefined in sim_switch.c? https://gerrit.osmocom.org/c/simtrace2/+/24879/2/firmware/libboard/ngff_cardem/source/sim_switch.c File firmware/libboard/ngff_cardem/source/sim_switch.c: https://gerrit.osmocom.org/c/simtrace2/+/24879/2/firmware/libboard/ngff_cardem/source/sim_switch.c@25 PS2, Line 25: static const Pin pin_conn_usim1 = {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}; Why are those definitions not in board.h as well? -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/24879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9649c853271c22d5403cdf3a7ec9029c9cecfa32 Gerrit-Change-Number: 24879 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-Comment-Date: Thu, 29 Jul 2021 17:59:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-msc[master]: implement CM Re-Establish for voice calls
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25076 ) Change subject: implement CM Re-Establish for voice calls .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/25076/1/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/25076/1/src/libmsc/msc_a.c@125 PS1, Line 125: ? MSC_CTR_CM_RE_ESTABLISH_REQ_ACCEPTED : MSC_CTR_CM_RE_ESTABLISH_REQ_REJECTED)); > > You can still merge it with linter CR-1 […] => https://gerrit.osmocom.org/c/osmo-ci/+/25107 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6fa37d6ca9fcb1637742b40e37b68d67664c9b60 Gerrit-Change-Number: 25076 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 17:25:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-ci[master]: lint: ignore LONG_LONE
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25107 ) Change subject: lint: ignore LONG_LONE .. lint: ignore LONG_LONE With recent code reviews I've realized that in Osmocom we do often use more than 120 characters per line for various reasons. So adjust the linter to not fail anymore if that is the case. Related: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h#32 Related: https://gerrit.osmocom.org/c/osmo-msc/+/25076/1/src/libmsc/msc_a.c#125 Related: OS#5087 Change-Id: I88fd86ac550fddb3017aeceb647c3d9e75367372 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/07/25107/1 diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index e88688a..abeed56 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -23,6 +23,7 @@ # * INITIALISED_STATIC: we use this, see also http://lkml.iu.edu/hypermail/linux/kernel/0808.1/2235.html # * LINE_CONTINUATIONS: false positives # * LINE_SPACING: we don't always put a blank line after declarations +# * LONG_LINE: should be 120 chars, but exceptions are done often so don't fail here # * PREFER_DEFINED_ATTRIBUTE_MACRO: macros like __packed not defined in libosmocore # * PREFER_FALLTHROUGH: pseudo keyword macro "fallthrough" is not defined in libosmocore # * REPEATED_WORD: false positives in doxygen descriptions (e.g. '\param[in] data Data passed through...') @@ -50,6 +51,7 @@ --ignore INITIALISED_STATIC \ --ignore LINE_CONTINUATIONS \ --ignore LINE_SPACING \ + --ignore LONG_LINE \ --ignore PREFER_DEFINED_ATTRIBUTE_MACRO \ --ignore PREFER_FALLTHROUGH \ --ignore REPEATED_WORD \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25107 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I88fd86ac550fddb3017aeceb647c3d9e75367372 Gerrit-Change-Number: 25107 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-msc[master]: implement CM Re-Establish for voice calls
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25076 ) Change subject: implement CM Re-Establish for voice calls .. Patch Set 4: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/25076/4/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/c/osmo-msc/+/25076/4/src/libmsc/gsm_04_08.c@921 PS4, Line 921: * Clear any connections at will. */ I guess fixing this requires major refactoring and is out of scope for this patch. Hopefully there are plans to follow up? https://gerrit.osmocom.org/c/osmo-msc/+/25076/1/src/libmsc/msc_a.c File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/25076/1/src/libmsc/msc_a.c@125 PS1, Line 125: ? MSC_CTR_CM_RE_ESTABLISH_REQ_ACCEPTED : MSC_CTR_CM_RE_ESTABLISH_REQ_REJECTED)); > You can still merge it with linter CR-1 +1 FWIW, the linter is still in testing, and therefore only enabled in osmo-mgw (a project I picked randomly). It seems that the line length check is more annoying than useful so I'll submit a patch to disable it. Ping me if it does something annoying, then I can fix it (or submit a patch to change the behavior yourself). The idea is that it errors on the cases where it's definitively against accepted coding standards, e.g. function() { instead of function() { but that it doesn't annoy us with false positives (such as the max line check that apparently is fine to ignore under certain conditions). -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6fa37d6ca9fcb1637742b40e37b68d67664c9b60 Gerrit-Change-Number: 25076 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 17:00:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-msc[master]: add vlr_subscr_find_by_mi
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25075 ) Change subject: add vlr_subscr_find_by_mi .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I5291d098a02268bd1c2e30195ae61e4a13e8709c Gerrit-Change-Number: 25075 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:36:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-msc[master]: add sequence_charts/call_reestablishment.msc
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25074 ) Change subject: add sequence_charts/call_reestablishment.msc .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6ebc3a0555ef82e1c027ca75b45f8147a3e07ee6 Gerrit-Change-Number: 25074 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:35:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: add MSC_Tests.TC_call_re_establishment_ciph
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25091 ) Change subject: msc: add MSC_Tests.TC_call_re_establishment_ciph .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25091 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: I8bbe53fc9fced3e455aa30c571ef7684890adb99 Gerrit-Change-Number: 25091 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:32:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: add MSC_Tests.TC_call_re_establishment_auth
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25073 ) Change subject: msc: add MSC_Tests.TC_call_re_establishment_auth .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25073 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: I8110a6b432de734d53b111c7b69aabca12129691 Gerrit-Change-Number: 25073 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:31:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf.h: Improve documentation on several flags
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25106 ) Change subject: tbf.h: Improve documentation on several flags .. tbf.h: Improve documentation on several flags Change-Id: Ice2c164ced039fb4ab621d8f7c2fb85f8348788a --- M src/tbf.h 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/06/25106/1 diff --git a/src/tbf.h b/src/tbf.h index 84c3d39..358a7ad 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -124,9 +124,9 @@ #define GPRS_RLCMAC_FLAG_CCCH 0 /* assignment on CCCH */ #define GPRS_RLCMAC_FLAG_PACCH 1 /* assignment on PACCH */ -#define GPRS_RLCMAC_FLAG_DL_ACK2 /* downlink acknowledge received */ -#define GPRS_RLCMAC_FLAG_TO_UL_ACK 3 -#define GPRS_RLCMAC_FLAG_TO_DL_ACK 4 +#define GPRS_RLCMAC_FLAG_DL_ACK2 /* DL TBF: At least one DL ACK/NACK was recieved since it was assigned */ +#define GPRS_RLCMAC_FLAG_TO_UL_ACK 3 /* UL TBF: Failed to receive last polled CTRL ACK confirming our UL ACK/NACK */ +#define GPRS_RLCMAC_FLAG_TO_DL_ACK 4 /* DL TBF: Failed to receive last polled DL ACK/NACK */ #define GPRS_RLCMAC_FLAG_TO_MASK 0xf0 /* timeout bits */ #define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25106 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ice2c164ced039fb4ab621d8f7c2fb85f8348788a Gerrit-Change-Number: 25106 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: msc: add MSC_Tests.TC_call_re_establishment
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25070 ) Change subject: msc: add MSC_Tests.TC_call_re_establishment .. Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25070/3/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25070/3/msc/MSC_Tests.ttcn@6647 PS3, Line 6647: 30.0 seems pretty high, also below. Shouldn't 10s be more than enough? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25070 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: Ifdff5573eeb3b3d41e8599b9b0228411d2576864 Gerrit-Change-Number: 25070 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:28:53 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf_dl: Clarify requirements for DL ACK/NACK
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25105 ) Change subject: tbf_dl: Clarify requirements for DL ACK/NACK .. tbf_dl: Clarify requirements for DL ACK/NACK Method is renamed since it clearly relates to getting DL ACK/NACK, no CTRL ACK. use same methods in both scheduler and internal use since they are expectd to be run in the same code path by the scheduler. This way we make sure the same conditions apply and it's clearer when looking at the code. Change-Id: Ib0e9b9547f5292b95064bab2dc182fdf659f0518 --- M src/gprs_rlcmac_sched.cpp M src/tbf_dl.cpp M src/tbf_dl.h 3 files changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/25105/1 diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index d73e55d..ed81981 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -239,7 +239,7 @@ int age_thresh1 = msecs_to_frames(200); int age_thresh2 = msecs_to_frames(OSMO_MIN(msecs_t3190/2, dl_tbf_idle_msec)); - if (tbf->is_control_ts(ts) && tbf->need_control_ts()) + if (tbf->is_control_ts(ts) && tbf->need_poll_for_dl_ack_nack()) return DL_PRIO_CONTROL; if (tbf->is_control_ts(ts) && age > age_thresh2 && age_thresh2 > 0) diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index bed7a08..34c5630 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -779,7 +779,6 @@ uint8_t *msg_data; struct msgb *dl_msg; unsigned msg_len; - bool need_poll; /* TODO: support MCS-7 - MCS-9, where data_block_idx can be 1 */ uint8_t data_block_idx = 0; unsigned int rrbp; @@ -940,23 +939,20 @@ if (m_last_dl_poll_fn < 0) m_last_dl_poll_fn = fn; - need_poll = state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK); - - /* poll after POLL_ACK_AFTER_FRAMES frames, or when final block is tx. -*/ - if (m_tx_counter >= POLL_ACK_AFTER_FRAMES || m_dl_ack_requested || - need_poll) { + /* poll after POLL_ACK_AFTER_FRAMES frames, or when final block is tx or +* when last polled DL ACK/NACK was lost. */ + if (need_poll_for_dl_ack_nack()) { if (m_dl_ack_requested) { LOGPTBFDL(this, LOGL_DEBUG, "Scheduling Ack/Nack polling, because it was requested explicitly " "(e.g. first final block sent).\n"); - } else if (need_poll) { + } else if (state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK)) { LOGPTBFDL(this, LOGL_DEBUG, "Scheduling Ack/Nack polling, because polling timed out.\n"); } else { LOGPTBFDL(this, LOGL_DEBUG, "Scheduling Ack/Nack polling, because %d blocks sent.\n", - POLL_ACK_AFTER_FRAMES); + POLL_ACK_AFTER_FRAMES); } rc = check_polling(fn, ts, _poll_fn, ); @@ -1211,8 +1207,11 @@ m_dl_ack_requested = true; } -bool gprs_rlcmac_dl_tbf::need_control_ts() const +/* Does this DL TBF require to poll the MS for DL ACK/NACK? */ +bool gprs_rlcmac_dl_tbf::need_poll_for_dl_ack_nack() const { + /* poll after POLL_ACK_AFTER_FRAMES frames, or when final block is tx or +* when last polled DL ACK/NACK was lost. */ return state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK) || m_tx_counter >= POLL_ACK_AFTER_FRAMES || m_dl_ack_requested; diff --git a/src/tbf_dl.h b/src/tbf_dl.h index ad1469a..27b6a2c 100644 --- a/src/tbf_dl.h +++ b/src/tbf_dl.h @@ -53,7 +53,7 @@ void trigger_ass(struct gprs_rlcmac_tbf *old_tbf); void request_dl_ack(); - bool need_control_ts() const; + bool need_poll_for_dl_ack_nack() const; bool have_data() const; int frames_since_last_poll(unsigned fn) const; int frames_since_last_drain(unsigned fn) const; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib0e9b9547f5292b95064bab2dc182fdf659f0518 Gerrit-Change-Number: 25105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-pcu[master]: Move timer X2002 to tbf_fsm
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25104 ) Change subject: Move timer X2002 to tbf_fsm .. Move timer X2002 to tbf_fsm Related: OS#2709 Change-Id: I94b71c60ed49d51ebdf6d6b428056b4b94354676 --- M src/bts.cpp M src/gprs_rlcmac_sched.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp M src/tbf_dl.h M src/tbf_fsm.c M src/tbf_fsm.h M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err 11 files changed, 133 insertions(+), 86 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/04/25104/1 diff --git a/src/bts.cpp b/src/bts.cpp index ee6b915..3cb2265 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -648,11 +648,7 @@ } LOGP(DRLCMAC, LOGL_DEBUG, "Got IMM.ASS confirm for TLLI=%08x\n", tlli); - - if (dl_tbf->m_wait_confirm) { - /* Transition to FLOW in gprs_rlcmac_tbf::handle_timeout() when timer expires */ - T_START(dl_tbf, T0, -2002, "assignment (AGCH)", true); - } + osmo_fsm_inst_dispatch(dl_tbf->state_fsm.fi, TBF_EV_ASSIGN_PCUIF_CNF, NULL); return 0; } diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 18c0763..d73e55d 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -308,10 +308,6 @@ && tbf->state_is_not(TBF_ST_FINISHED)) continue; - /* waiting for CCCH IMM.ASS confirm */ - if (tbf->m_wait_confirm) - continue; - /* If a GPRS (CS1-4) Dl block is required, skip EGPRS(_GSMK) tbfs: */ if (req_mcs_kind == GPRS && tbf->is_egprs_enabled()) continue; diff --git a/src/pdch.cpp b/src/pdch.cpp index 9477178..439759f 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -369,8 +369,6 @@ tbf_free(tbf); osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL); - /* stop pending assignment timer */ - new_tbf->t_stop(T0, "control acked (DL-TBF)"); tbf_assign_control_ts(new_tbf); return; diff --git a/src/tbf.cpp b/src/tbf.cpp index 74a44d9..5efbe7f 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -59,8 +59,6 @@ unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */ -static void tbf_timer_cb(void *_tbf); - const struct value_string gprs_rlcmac_tbf_ul_ack_state_names[] = { OSMO_VALUE_STRING(GPRS_RLCMAC_UL_ACK_NONE), OSMO_VALUE_STRING(GPRS_RLCMAC_UL_ACK_SEND_ACK), /* send acknowledge on next RTS */ @@ -76,7 +74,6 @@ }; static const struct value_string tbf_timers_names[] = { - OSMO_VALUE_STRING(T0), OSMO_VALUE_STRING(T3141), OSMO_VALUE_STRING(T3191), OSMO_VALUE_STRING(T3193), @@ -422,7 +419,6 @@ if (t != T_MAX) return osmo_timer_pending([t]); - /* we don't start with T0 because it's internal timer which requires special handling */ for (i = T3141; i < T_MAX; i++) if (osmo_timer_pending([i])) return true; @@ -433,8 +429,7 @@ void gprs_rlcmac_tbf::stop_timers(const char *reason) { uint8_t i; - /* we start with T0 because timer reset does not require any special handling */ - for (i = T0; i < T_MAX; i++) + for (i = T3141; i < T_MAX; i++) t_stop((enum tbf_timers)i, reason); } @@ -502,9 +497,6 @@ Tarr[t].data = this; switch(t) { - case T0: - Tarr[t].cb = tbf_timer_cb; - break; case T3141: Tarr[t].cb = cb_T3141; break; @@ -594,7 +586,6 @@ void gprs_rlcmac_tbf::poll_timeout(struct gprs_rlcmac_pdch *pdch, uint32_t poll_fn, enum pdch_ulc_tbf_poll_reason reason) { - uint16_t pgroup; gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(this); LOGPTBF(this, LOGL_NOTICE, "poll timeout for FN=%d, TS=%d (curr FN %d)\n", @@ -645,7 +636,8 @@ /* Timeout waiting for CTRL ACK acking Pkt Cell Change Continue */ osmo_fsm_inst_dispatch(m_ms->nacc->fi, NACC_EV_TIMEOUT_CELL_CHG_CONTINUE, NULL); return; - } else if (direction == GPRS_RLCMAC_DL_TBF) { + } else if (reason == PDCH_ULC_POLL_DL_ACK) { + /* POLL Timeout expecting DL ACK/NACK: implies direction == GPRS_RLCMAC_DL_TBF */ gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(this); if (!(dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) { @@ -669,16 +661,7 @@ return; } /* resend IMM.ASS on CCCH on timeout */ - if ((dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)) -&& !(dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))) { -
Change in osmo-ttcn3-hacks[master]: msc: split f_start_handler_with_pars()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25089 ) Change subject: msc: split f_start_handler_with_pars() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25089 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: Ic7e9dbb8c9db5948fe35fc3051bb988d65622782 Gerrit-Change-Number: 25089 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:11:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: add a COORD port for inter-component coordination
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25069 ) Change subject: msc: add a COORD port for inter-component coordination .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25069 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: Iba3a5304fa40159bc2c31cdc3a71ee56ed08bd12 Gerrit-Change-Number: 25069 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:10:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: add as_mgcp_ack_all_dlcx
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25068 ) Change subject: msc: add as_mgcp_ack_all_dlcx .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25068 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: Ic63fa41fa2e5d392d39f6b5f9edd3952aa6a9ee9 Gerrit-Change-Number: 25068 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:08:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: SMPP_Emulation: replace previous entries in f_create_smpp_expect()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25072 ) Change subject: SMPP_Emulation: replace previous entries in f_create_smpp_expect() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25072 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: I63856fc158f5db9ced9185c208035b26e7ed7a74 Gerrit-Change-Number: 25072 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:07:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: GSUP_Emulation: allow moving HLR handling to another test component
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25071 ) Change subject: GSUP_Emulation: allow moving HLR handling to another test component .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25071 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: I235492185cda68f9f8e845085e3f6efe76a13501 Gerrit-Change-Number: 25071 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:03:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: MNCC_Emulation: allow moving call handling to another test component
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25067 ) Change subject: MNCC_Emulation: allow moving call handling to another test component .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25067 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: If7e952e54ebd1bb88cce11ec5f0ff4826e02cb63 Gerrit-Change-Number: 25067 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 16:02:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: MGCP_Emulation: allow moving ep handling to another test component
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25066 ) Change subject: MGCP_Emulation: allow moving ep handling to another test component .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25066 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: Id46035e53c2870e1fdef1335dce42b2020f7cd54 Gerrit-Change-Number: 25066 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:59:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: L3_Templates: add ts_ML3_MO_CC_DISC
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25065 ) Change subject: L3_Templates: add ts_ML3_MO_CC_DISC .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25065 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: Ie152f8760c9bd6df04a20fdbb7ce9bbde9cb3d68 Gerrit-Change-Number: 25065 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:57:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_ratectr: do not set talloc destructor on library allocated item
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25103 ) Change subject: mgcp_ratectr: do not set talloc destructor on library allocated item .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifc5091e9f95cc721e58d1eb2e55b97102c497706 Gerrit-Change-Number: 25103 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:56:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: eliminate bssap_idx
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25088 ) Change subject: msc: eliminate bssap_idx .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25088 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: Ib5c5585f098ff269920cf9d5781c4366234854c5 Gerrit-Change-Number: 25088 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:55:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: fix conn id in 'MGCP OK' msg (as_mgcp_ack_all_mdcx)
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25064 ) Change subject: msc: fix conn id in 'MGCP OK' msg (as_mgcp_ack_all_mdcx) .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25064 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: If6f7f135d95c04ee0240f3fa9ba0b18ffc6fa24a Gerrit-Change-Number: 25064 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:53:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_ratectr: add stats items to monitor trunk usage
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25041 ) Change subject: mgcp_ratectr: add stats items to monitor trunk usage .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/25041/2/src/libosmo-mgcp/mgcp_ratectr.c File src/libosmo-mgcp/mgcp_ratectr.c: https://gerrit.osmocom.org/c/osmo-mgw/+/25041/2/src/libosmo-mgcp/mgcp_ratectr.c@271 PS2, Line 271: static int free_stat_item_group(struct osmo_stat_item_group *stat_item_group) I usually add "talloc_destructor" at the end of this function name, to clearly state it's for talloc internall calling and should not be called directly. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6d3a74f6087512130d85002348787bffc672de81 Gerrit-Change-Number: 25041 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:52:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: add TC_cm_reestablishment
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25021 ) Change subject: bsc: add TC_cm_reestablishment .. Patch Set 4: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25021/4/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25021/4/bsc/BSC_Tests.ttcn@9470 PS4, Line 9470: attemts (attempts) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25021/4/bsc/BSC_Tests.ttcn@9559 PS4, Line 9559: 40.0 this seems very high -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25021 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: I1e7d446644f46b8a0a94688e618ffb4f23a8900e Gerrit-Change-Number: 25021 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 29 Jul 2021 15:52:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_ratectr: do not set talloc destructor on library allocated item
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/25103 to look at the new patch set (#2). Change subject: mgcp_ratectr: do not set talloc destructor on library allocated item .. mgcp_ratectr: do not set talloc destructor on library allocated item The rate counter and stats item groups, which are allocated in mgcp_ratectr.c are freed using a talloc destructor that is set in the context of the item we just allocated using the stats / rate counter API functions. When we do that, we risk overwriting an already existing talloc destructor. Lets instead implement own free functions and set those as talloc_destructor from above (trunk and MGCP config) Change-Id: Ifc5091e9f95cc721e58d1eb2e55b97102c497706 Related: SYS#5201 --- M include/osmocom/mgcp/mgcp_ratectr.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_ratectr.c M src/libosmo-mgcp/mgcp_trunk.c 4 files changed, 83 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/25103/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifc5091e9f95cc721e58d1eb2e55b97102c497706 Gerrit-Change-Number: 25103 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-mgw[master]: mgcp_ratectr: add stats items to monitor trunk usage
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25041 ) Change subject: mgcp_ratectr: add stats items to monitor trunk usage .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/25041/1/src/libosmo-mgcp/mgcp_ratectr.c File src/libosmo-mgcp/mgcp_ratectr.c: https://gerrit.osmocom.org/c/osmo-mgw/+/25041/1/src/libosmo-mgcp/mgcp_ratectr.c@293 PS1, Line 293: talloc_set_destructor(stats->common, free_stat_item_group); > Ack I have now changed the talloc destructor scheme, but I thin it is better to handle this in another patch, see: Change ID: Ifc5091e9f95cc721e58d1eb2e55b97102c497706 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6d3a74f6087512130d85002348787bffc672de81 Gerrit-Change-Number: 25041 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:46:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_ratectr: do not set talloc destructor on library allocated item
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25103 ) Change subject: mgcp_ratectr: do not set talloc destructor on library allocated item .. mgcp_ratectr: do not set talloc destructor on library allocated item The rate counter and stats item groups, which are allocated in mgcp_ratectr.c are freed using a talloc destructor that is set in the context of the item we just allocated using the stats / rate counter API functions. When we do that, we risk overwriting an already existing talloc destructor. Lets instead implement own free functions and set those as talloc_destructor from above (trunk and MGCP config) Change-Id: Ifc5091e9f95cc721e58d1eb2e55b97102c497706 Related: SYS#5201 --- M include/osmocom/mgcp/mgcp_ratectr.h M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_ratectr.c M src/libosmo-mgcp/mgcp_trunk.c 4 files changed, 83 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/25103/1 diff --git a/include/osmocom/mgcp/mgcp_ratectr.h b/include/osmocom/mgcp/mgcp_ratectr.h index 5212f9b..a01e025 100644 --- a/include/osmocom/mgcp/mgcp_ratectr.h +++ b/include/osmocom/mgcp/mgcp_ratectr.h @@ -93,7 +93,9 @@ struct mgcp_trunk; int mgcp_ratectr_global_alloc(struct mgcp_config *cfg); +int mgcp_ratectr_global_free(struct mgcp_config *cfg); int mgcp_ratectr_trunk_alloc(struct mgcp_trunk *trunk); +int mgcp_ratectr_trunk_free(struct mgcp_trunk *trunk); /* Trunk-global common stat items */ enum { @@ -107,4 +109,4 @@ }; int mgcp_stat_trunk_alloc(struct mgcp_trunk *trunk); - +int mgcp_stat_trunk_free(struct mgcp_trunk *trunk); diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index e69c00f..74ee758 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1687,6 +1687,7 @@ } mgcp_ratectr_global_alloc(cfg); + talloc_set_destructor(cfg, mgcp_ratectr_global_free); return cfg; } diff --git a/src/libosmo-mgcp/mgcp_ratectr.c b/src/libosmo-mgcp/mgcp_ratectr.c index d8e0374..7362fe2 100644 --- a/src/libosmo-mgcp/mgcp_ratectr.c +++ b/src/libosmo-mgcp/mgcp_ratectr.c @@ -150,12 +150,6 @@ .ctr_desc = all_rtp_conn_rate_ctr_desc }; -static int free_rate_counter_group(struct rate_ctr_group *rate_ctr_group) -{ - rate_ctr_group_free(rate_ctr_group); - return 0; -} - /*! allocate global rate counters * (called once at startup). * \param[in] cfg mgw configuration for which the rate counters are allocated. @@ -173,12 +167,27 @@ return -EINVAL; snprintf(ctr_name, sizeof(ctr_name), "%s:general", cfg->domain); rate_ctr_group_set_name(ratectr->mgcp_general_ctr_group, ctr_name); - talloc_set_destructor(ratectr->mgcp_general_ctr_group, free_rate_counter_group); general_rate_ctr_index++; } return 0; } +/*! free global rate counters + * (called once at process shutdown). + * \param[in] cfg mgw configuration for which the rate counters are allocated. + * \returns 0 on success, -EINVAL on failure. */ +int mgcp_ratectr_global_free(struct mgcp_config *cfg) +{ + struct mgcp_ratectr_global *ratectr = >ratectr; + + if (ratectr->mgcp_general_ctr_group) { + rate_ctr_group_free(ratectr->mgcp_general_ctr_group); + ratectr->mgcp_general_ctr_group = NULL; + } + + return 0; +} + /*! allocate trunk specific rate counters * (called once on trunk initialization). * \param[in] trunk mgw trunk for which the rate counters are allocated. @@ -200,7 +209,6 @@ snprintf(ctr_name, sizeof(ctr_name), "%s-%u:crcx", mgcp_trunk_type_strs_str(trunk->trunk_type), trunk->trunk_nr); rate_ctr_group_set_name(ratectr->mgcp_crcx_ctr_group, ctr_name); - talloc_set_destructor(ratectr->mgcp_crcx_ctr_group, free_rate_counter_group); crcx_rate_ctr_index++; } if (ratectr->mgcp_mdcx_ctr_group == NULL) { @@ -211,7 +219,6 @@ snprintf(ctr_name, sizeof(ctr_name), "%s-%u:mdcx", mgcp_trunk_type_strs_str(trunk->trunk_type), trunk->trunk_nr); rate_ctr_group_set_name(ratectr->mgcp_mdcx_ctr_group, ctr_name); - talloc_set_destructor(ratectr->mgcp_mdcx_ctr_group, free_rate_counter_group); mdcx_rate_ctr_index++; } if (ratectr->mgcp_dlcx_ctr_group == NULL) { @@ -222,7 +229,6 @@ snprintf(ctr_name, sizeof(ctr_name), "%s-%u:dlcx", mgcp_trunk_type_strs_str(trunk->trunk_type), trunk->trunk_nr); rate_ctr_group_set_name(ratectr->mgcp_dlcx_ctr_group, ctr_name); - talloc_set_destructor(ratectr->mgcp_dlcx_ctr_group, free_rate_counter_group);
Change in osmo-mgw[master]: mgcp_ratectr: add stats items to monitor trunk usage
Hello Jenkins Builder, neels, laforge, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/25041 to look at the new patch set (#2). Change subject: mgcp_ratectr: add stats items to monitor trunk usage .. mgcp_ratectr: add stats items to monitor trunk usage We are currently counting events in rate counters, but there is currently no way to get a sample of the current situation of the trunk usage. In particular how many endpoints are currently in use. This is a corrected version of: Ib7b654168dc3512f55e45cc4755dc1f6f423d023 Change-Id: I6d3a74f6087512130d85002348787bffc672de81 Related: SYS#5201 --- M include/osmocom/mgcp/mgcp_ratectr.h M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_ratectr.c M src/libosmo-mgcp/mgcp_trunk.c M tests/mgcp/mgcp_test.c 6 files changed, 101 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/41/25041/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6d3a74f6087512130d85002348787bffc672de81 Gerrit-Change-Number: 25041 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: tbf: Use type bool for upgrade_to_multislot
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25102 ) Change subject: tbf: Use type bool for upgrade_to_multislot .. tbf: Use type bool for upgrade_to_multislot Change-Id: I644d91b6230a90cc72e83443c11d24b8d0a2dcac --- M src/gprs_rlcmac_ts_alloc.cpp M src/tbf.cpp M src/tbf.h 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/02/25102/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 5ccbb9f..3c16d8a 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -421,7 +421,7 @@ tbf_->first_ts = tbf_->first_common_ts = ts; ms_set_reserved_slots(ms, trx, 1 << ts, 1 << ts); - tbf_->upgrade_to_multislot = 0; + tbf_->upgrade_to_multislot = false; bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_A); return 0; } @@ -945,7 +945,7 @@ 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 = 0; + tbf_->upgrade_to_multislot = false; LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using %d slots\n", slotcount); } diff --git a/src/tbf.cpp b/src/tbf.cpp index 842161c..74a44d9 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -110,7 +110,7 @@ control_ts(0xff), fT(0), num_fT_exp(0), - upgrade_to_multislot(0), + upgrade_to_multislot(false), bts(bts_), m_tfi(0), m_created_ts(0), diff --git a/src/tbf.h b/src/tbf.h index 96a5788..4218cf5 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -265,7 +265,7 @@ } meas; /* Can/should we upgrade this tbf to use multiple slots? */ - uint8_t upgrade_to_multislot; + bool upgrade_to_multislot; /* store the BTS this TBF belongs to */ struct gprs_rlcmac_bts *bts; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I644d91b6230a90cc72e83443c11d24b8d0a2dcac Gerrit-Change-Number: 25102 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ci[master]: repo-install-test: disable osmo-pcap-server
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25100 ) Change subject: repo-install-test: disable osmo-pcap-server .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic40a4df8b86ca1dda6a08aa3f9381391e6fb0770 Gerrit-Change-Number: 25100 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:03:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: clear SERVICES_NIGHTLY list
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25101 ) Change subject: repo-install-test: clear SERVICES_NIGHTLY list .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idc94270978ec5ca67d6f7e20e009f905e972f984 Gerrit-Change-Number: 25101 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 15:03:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: disable osmo-pcap-server
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25100 ) Change subject: repo-install-test: disable osmo-pcap-server .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic40a4df8b86ca1dda6a08aa3f9381391e6fb0770 Gerrit-Change-Number: 25100 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 14:21:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: disable osmo-pcap-server
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25100 ) Change subject: repo-install-test: disable osmo-pcap-server .. repo-install-test: disable osmo-pcap-server Disable checking if the osmo-pcap-server service starts up, as it conflicts with osmo-bts and sometimes causes the test to fail. Related: OS#5203 Change-Id: Ic40a4df8b86ca1dda6a08aa3f9381391e6fb0770 --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/25100/1 diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index 91c8375..fe3e2ce 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -12,6 +12,7 @@ # * osmo-ctrl2cgi (missing config: /etc/osmocom/ctrl2cgi.ini, OS#4108) # * osmo-trap2cgi (missing config: /etc/osmocom/%N.ini, OS#4108) # * osmo-ggsn (no tun device in docker) +# * osmo-pcap-server (ctrl port in config conflicts with osmo-bts, OS#5203) SERVICES=" osmo-bsc osmo-gbproxy @@ -24,13 +25,11 @@ osmo-stp " # Services working in nightly, but not yet in latest -# * osmo-pcap-server: service not included in osmo-pcap 0.0.11 # * osmo-sgsn: conflicts with osmo-gtphub config in osmo-sgsn 1.4.0 # * osmo-pcu: needs osmo-bts-virtual to start up properly # * osmo-hnbgw: tries to listen on 10.23.24.1 in osmo-iuh 0.4.0 # * osmo-bts-virtual: unit id not matching osmo-bsc's config in osmo-bsc 1.4.0 SERVICES_NIGHTLY=" - osmo-pcap-server osmo-sgsn osmo-pcu osmo-hnbgw -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic40a4df8b86ca1dda6a08aa3f9381391e6fb0770 Gerrit-Change-Number: 25100 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-ci[master]: repo-install-test: clear SERVICES_NIGHTLY list
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25101 ) Change subject: repo-install-test: clear SERVICES_NIGHTLY list .. repo-install-test: clear SERVICES_NIGHTLY list All services that start up in nightly should also start in the latest release now, as new versions have been released of related programs. Change-Id: Idc94270978ec5ca67d6f7e20e009f905e972f984 --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/01/25101/1 diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index fe3e2ce..b574f54 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -15,25 +15,22 @@ # * osmo-pcap-server (ctrl port in config conflicts with osmo-bts, OS#5203) SERVICES=" osmo-bsc + osmo-bts-virtual osmo-gbproxy osmo-gtphub osmo-hlr + osmo-hnbgw osmo-mgw osmo-msc osmo-pcap-client + osmo-pcu + osmo-sgsn osmo-sip-connector osmo-stp " # Services working in nightly, but not yet in latest -# * osmo-sgsn: conflicts with osmo-gtphub config in osmo-sgsn 1.4.0 -# * osmo-pcu: needs osmo-bts-virtual to start up properly -# * osmo-hnbgw: tries to listen on 10.23.24.1 in osmo-iuh 0.4.0 -# * osmo-bts-virtual: unit id not matching osmo-bsc's config in osmo-bsc 1.4.0 +# * (currently none) SERVICES_NIGHTLY=" - osmo-sgsn - osmo-pcu - osmo-hnbgw - osmo-bts-virtual " distro_obsdir() { -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idc94270978ec5ca67d6f7e20e009f905e972f984 Gerrit-Change-Number: 25101 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in osmo-mgw[master]: mgcp_trunk: check MGW domain name earlier
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25099 ) Change subject: mgcp_trunk: check MGW domain name earlier .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I9944a9103981fb5f4d0d8714ee2847ae020f76df Gerrit-Change-Number: 25099 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 13:36:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_trunk: check MGW domain name earlier
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/25099 to look at the new patch set (#2). Change subject: mgcp_trunk: check MGW domain name earlier .. mgcp_trunk: check MGW domain name earlier The MGW domain name is usually checked while resolving the endpoint after the trunk has been resolved. This was no problem before, but since we allow wildcarded DLCX requests, which require only a trunk to work, the check is not done correctly for wildcarded DLCX requests and invalid domain names may slip through. Checking the domain name earlier while the trunk is resolved makes sense and it fixes the problem. Change-Id: I9944a9103981fb5f4d0d8714ee2847ae020f76df --- M src/libosmo-mgcp/mgcp_endp.c M src/libosmo-mgcp/mgcp_trunk.c 2 files changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/25099/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I9944a9103981fb5f4d0d8714ee2847ae020f76df Gerrit-Change-Number: 25099 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Fix typos in comments documenting fsm st chg macro
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25095 ) Change subject: Fix typos in comments documenting fsm st chg macro .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8f1cef5810c84441f7d6d2fbe5b3106e0ae71b69 Gerrit-Change-Number: 25095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:25:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Merge handle_ack_nack() into rcvd_dl_ack()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25094 ) Change subject: tbf: Merge handle_ack_nack() into rcvd_dl_ack() .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25094/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25094/1//COMMIT_MSG@7 PS1, Line 7: handle_ack_nack > rcvd_dl_ack Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I546d2e46bda96a2f551b28673464e57831c71828 Gerrit-Change-Number: 25094 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:25:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmo-pcu[master]: Get rid of lots of code only used by tests
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25093 ) Change subject: Get rid of lots of code only used by tests .. Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.cpp File tests/tbf/TbfTest.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.cpp@263 PS1, Line 263: #define RCV_ACK(fin, tbf, rbb) do { \ > this macro is long and hard to read. […] Done https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.err File tests/tbf/TbfTest.err: https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.err@503 PS1, Line 503: 0 > Because last one was wrong (and nobody cared because it's not used in > osmo-pcu). […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I14d9312cb61534dc97fca83141b9c0cd933c9206 Gerrit-Change-Number: 25093 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:24:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25090 ) Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25090/1/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25090/1/src/tbf.cpp@1005 PS1, Line 1005: No uplink data received yet| > Thanks for mentioning, it's of course wrong. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559 Gerrit-Change-Number: 25090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:21:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_DL_ASS
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25061 ) Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_DL_ASS .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I13f92f058c219f230d57b3c00b8ae1d187603813 Gerrit-Change-Number: 25061 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:20:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: mgcp_trunk: check MGW domain name earlier
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25099 ) Change subject: mgcp_trunk: check MGW domain name earlier .. mgcp_trunk: check MGW domain name earlier The MGW domain name is usually checked while resolving the endpoint after the trunk has been resolved. This was no problem before, but since we allow wildcarded DLCX requests, which require only a trunk to work, the check is not done correctly for wildcarded DLCX requests and invalid domain names may slip through. Checking the domain name earlier while the trunk is resolved makes sense and it fixes the problem. Change-Id: I9944a9103981fb5f4d0d8714ee2847ae020f76df --- M src/libosmo-mgcp/mgcp_trunk.c 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/99/25099/1 diff --git a/src/libosmo-mgcp/mgcp_trunk.c b/src/libosmo-mgcp/mgcp_trunk.c index 27663b4..73de972 100644 --- a/src/libosmo-mgcp/mgcp_trunk.c +++ b/src/libosmo-mgcp/mgcp_trunk.c @@ -206,6 +206,32 @@ } } +/* Check if the domain name, which is supplied with the endpoint name + * matches the configuration. */ +static int check_domain_name(const char *epname, const struct mgcp_config *cfg) +{ + char *domain_to_check; + + domain_to_check = strstr(epname, "@"); + if (!domain_to_check) { + LOGP(DLMGCP, LOGL_ERROR, "missing domain name in endpoint name \"%s\", expecting \"%s\"\n", +epname, cfg->domain); + return -EINVAL; + } + + /* Accept any domain if configured as "*" */ + if (!strcmp(cfg->domain, "*")) + return 0; + + if (strcmp(domain_to_check+1, cfg->domain) != 0) { + LOGP(DLMGCP, LOGL_ERROR, "wrong domain name in endpoint name \"%s\", expecting \"%s\"\n", +epname, cfg->domain); + return -EINVAL; + } + + return 0; +} + /*! Find a trunk by the trunk prefix in the endpoint name. * \param[in] epname endpoint name with trunk prefix to look up. * \param[in] cfg that contains the trunks where the endpoint is located. @@ -220,6 +246,10 @@ osmo_str_tolower_buf(epname_lc, sizeof(epname_lc), epname); epname = epname_lc; + /* All endpoint names require a domain as suffix */ + if (check_domain_name(epname, cfg)) + return NULL; + prefix_len = sizeof(MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK) - 1; if (strncmp(epname, MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK, prefix_len) == 0) { return mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I9944a9103981fb5f4d0d8714ee2847ae020f76df Gerrit-Change-Number: 25099 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-pcu[master]: replace dl_ass_state with osmocom FSM
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25060 ) Change subject: replace dl_ass_state with osmocom FSM .. Patch Set 2: Code-Review+1 (6 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.h File src/tbf_dl_ass_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.h@32 PS1, Line 32: Ul > Dl? Same 2x below Done https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.h@38 PS1, Line 38: downlonk > downlink Done https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c File src/tbf_dl_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@72 PS1, Line 72: // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? > That's expected, it wasn't there in previous code I created this from, but > while looking at it I saw […] Ack https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@88 PS1, Line 88: // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? > Same as above. Ack https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@93 PS1, Line 93: new_dl_tbf = ms_dl_tbf(ms); > Yes, I removed it on purpose while reworking the function in the new place, > since a TBF is alweays g […] Ack https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@190 PS1, Line 190: Plt Ul > Pkt Dl? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia33418478e17986a316ffda48b091030f53fa371 Gerrit-Change-Number: 25060 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:19:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-pcu[master]: Replace ul_ass_state with osmocom FSM
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25056 ) Change subject: Replace ul_ass_state with osmocom FSM .. Patch Set 5: (4 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h File src/tbf_ul_ass_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@50 PS4, Line 50: assignment_fsm_timeouts > (Same for "replace dl_ass_state with osmocom FSM" patch) Done https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@62 PS4, Line 62: MS_ANR_EV_CREATE_RLCMAC_MSG > (Same for "replace dl_ass_state with osmocom FSM" patch) Done https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c File src/tbf_ul_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c@219 PS4, Line 219: Plt > Pkt? Done https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c@306 PS4, Line 306: bool tbf_ul_ass_rts(const struct gprs_rlcmac_tbf* tbf) > It's common in different osmocom projects like osmo-bts. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 Gerrit-Change-Number: 25056 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:18:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_UL_ASS
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25059 ) Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_UL_ASS .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20aa7f83cc4f32de129e64c74a91745b983a7b16 Gerrit-Change-Number: 25059 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:15:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Replace ul_ass_state with osmocom FSM
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25056 ) Change subject: Replace ul_ass_state with osmocom FSM .. Patch Set 5: Code-Review+1 (3 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp@967 PS4, Line 967: osmo_fsm_inst_update_id(tbf->ul_ass_fsm.fi, buf); > No need for that, the name of the FSM (which is different for the 2 types) > always show up next to th […] Ack https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h File src/tbf_ul_ass_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@32 PS4, Line 32: TBF_UL_ASS_EV_CREATE_RLCMAC_MSG, /* Scheduler wants to gen+Tx the Ass (rej): data=tbf_ul_ass_ev_create_rlcmac_msg_ctx */ > I prefer keeping comment in one line even if it's a few chars too long. Ack https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@52 PS4, Line 52: fi > no, the comment is fine. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 Gerrit-Change-Number: 25056 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 13:15:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-dev[master]: gen_makefile.py: add make rules for all projects
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/25098 ) Change subject: gen_makefile.py: add make rules for all projects .. gen_makefile.py: add make rules for all projects Allow to easily build any Osmocom project in a build directory generated by osmo-dev, even if it is not listed in the specified .deps file. This avoids the need to set up a new build directory and build common dependencies (e.g. libosmocore) again. All rules that act on multiple projects (default make target "all", "clone", "clean" "all-install") will still only take the selected projects into account. The idea is to extend deps.all on demand. Currently it contains everything from 3G+2G.deps plus: - osmo-bts - osmo-gbproxy - osmo-pcap - osmo-pcu Change-Id: Ibb932f36a9f97d6e9f3d69f4ce63b738fbb640fe --- M 2G.deps M 3G+2G.deps A all.deps M gen_makefile.py 4 files changed, 59 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/98/25098/1 diff --git a/2G.deps b/2G.deps index c090b6e..2d0745b 100644 --- a/2G.deps +++ b/2G.deps @@ -1,3 +1,4 @@ +# Note: Add new projects to all.deps too # project build these first libosmocore libosmo-abis libosmocore diff --git a/3G+2G.deps b/3G+2G.deps index b4372fd..7f9009e 100644 --- a/3G+2G.deps +++ b/3G+2G.deps @@ -1,3 +1,4 @@ +# Note: Add new projects to all.deps too # project build these first libosmocore libosmo-abis libosmocore diff --git a/all.deps b/all.deps new file mode 100644 index 000..7685ed5 --- /dev/null +++ b/all.deps @@ -0,0 +1,26 @@ +# List of *all* Osmocom projects that one might want to build with osmo-dev. +# Make targets get created for these projects, even if they are not in the +# .deps file passed to gen_makefile.py, so they can be conveniently built from +# any build dir generated by osmo-dev. + +# project build these first +libasn1c +libosmo-abis libosmocore +libosmo-netif libosmo-abis +libosmo-sccp libosmo-netif +libosmocore +libsmpp34 +osmo-bsc libosmo-sccp osmo-mgw +osmo-bts libosmocore, libosmo-abis +osmo-gbproxy libosmocore +osmo-ggsn libosmocore +osmo-hlr libosmo-abis +osmo-iuh libosmo-sccp libasn1c +osmo-mgw libosmo-netif +osmo-msc osmo-iuh osmo-mgw libsmpp34 osmo-hlr +osmo-pcap libosmocore +osmo-pcu libosmocore +osmo-sgsn osmo-iuh osmo-ggsn osmo-hlr +osmo-sip-connector libosmocore +osmo-smlc libosmo-sccp +osmo-trx libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index ad42978..fb81aac 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -148,7 +148,9 @@ return {} return dict(read_projects_deps(path)) -def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): +def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, + url, push_url, sudo_make_install, no_ldconfig, + ldconfig_without_sudo, make_check, deps_file): src_proj = os.path.join(src_dir, proj) if proj == 'openbsc': src_proj = os.path.join(src_proj, 'openbsc') @@ -165,7 +167,7 @@ configure_opts_str = '' return r''' -### {proj} ### +### {proj} ({deps_file}) ### {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") @@ -228,6 +230,7 @@ src_proj=make_to_src_proj, build_proj=make_to_build_proj, build_to_src=build_to_src, +deps_file=deps_file, deps_installed=' '.join(['.make.%s.install' % d for d in deps]), deps_reinstall=' '.join(['%s-reinstall' %d for d in deps]), configure_opts=configure_opts_str, @@ -312,13 +315,31 @@ out.write('all-install: \\\n\t' + ' \\\n\t'.join([ '.make.%s.install' % p for p, d in projects_deps ]) + '\n\n') - for proj, deps in projects_deps: -all_config_opts = [] -all_config_opts.extend(configure_opts.get('ALL') or []) -all_config_opts.extend(configure_opts.get(proj) or []) -out.write(gen_make(proj, deps, all_config_opts, args.jobs, - make_dir, args.src_dir, build_dir, args.url, args.push_url, - args.sudo_make_install, args.no_ldconfig, - args.ldconfig_without_sudo, args.make_check)) + # iterate over projects in the selected projects_deps file (e.g. 2G.deps) + # first, then iterate over all projects (all.deps) and add missing ones. this + # allows overriding projects and dependencies in the selected file, but also + # having make rules for all projects available to quickly build them without + # setting up a new build directory first. + projects = [x[0] for x in projects_deps] + for is_all in [False,
Change in osmo-bsc[master]: coverity: quench null deref warning in gscon_change_primary_lchan()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25097 ) Change subject: coverity: quench null deref warning in gscon_change_primary_lchan() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8859c6cb9b3b15287e339ce4b6815b946965d0d9 Gerrit-Change-Number: 25097 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 29 Jul 2021 12:52:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: coverity: quench null deref warning in gscon_change_primary_lchan()
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25097 ) Change subject: coverity: quench null deref warning in gscon_change_primary_lchan() .. coverity: quench null deref warning in gscon_change_primary_lchan() The if conditions for logging an lchan change made it look like new_lchan might actually be NULL, which it never is. So rather pin new_lchan as non-NULL with an assert and simplify the logic. Related: CID#237146 Related: b0d854556dafe885d740346b1b34ab247cb09d56 Change-Id: I8859c6cb9b3b15287e339ce4b6815b946965d0d9 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/25097/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 671f065..afb633d 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -699,13 +699,15 @@ /* On release, do not receive release events that look like the primary lchan is gone. */ struct gsm_lchan *old_lchan = conn->lchan; + OSMO_ASSERT(new_lchan); + if (old_lchan == new_lchan) return; - if (!old_lchan && new_lchan) + if (!old_lchan) LOGPFSML(conn->fi, LOGL_DEBUG, "setting primary lchan for this conn to %s\n", new_lchan->fi? osmo_fsm_inst_name(new_lchan->fi) : gsm_lchan_name(new_lchan)); - else if (old_lchan && new_lchan) + else LOGPFSML(conn->fi, LOGL_DEBUG, "primary lchan for this conn changes from %s to %s\n", old_lchan->fi? osmo_fsm_inst_name(old_lchan->fi) : gsm_lchan_name(old_lchan), new_lchan->fi? osmo_fsm_inst_name(new_lchan->fi) : gsm_lchan_name(new_lchan)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8859c6cb9b3b15287e339ce4b6815b946965d0d9 Gerrit-Change-Number: 25097 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in osmo-bsc[master]: Clarify string name for GSM_CHREQ_REASON_CALL
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25096 ) Change subject: Clarify string name for GSM_CHREQ_REASON_CALL .. Clarify string name for GSM_CHREQ_REASON_CALL The previous naming was confusing since when appearing on log files it seemed to mean the reason was mainly only call reestablishment, when it actually means either call establishment (the usual reason) OR call re-establishment (should happen seldomly). Let's add some parenthesis to make it clearer. Related: SYS#5548 Change-Id: Id2dccd71803335c284a5ba271fa7f7890d253c27 --- 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/96/25096/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 7140ad7..4db70f0 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -172,7 +172,7 @@ const struct value_string gsm_chreq_descs[] = { { GSM_CHREQ_REASON_EMERG, "emergency call" }, { GSM_CHREQ_REASON_PAG, "answer to paging" }, - { GSM_CHREQ_REASON_CALL,"call re-establishment" }, + { GSM_CHREQ_REASON_CALL,"call (re-)establishment" }, { GSM_CHREQ_REASON_LOCATION_UPD,"Location updating" }, { GSM_CHREQ_REASON_PDCH,"one phase packet access" }, { GSM_CHREQ_REASON_OTHER, "other" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25096 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id2dccd71803335c284a5ba271fa7f7890d253c27 Gerrit-Change-Number: 25096 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Build failure of network:osmocom:latest/libusrp in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libusrp/Debian_Unstable/x86_64 Package network:osmocom:latest/libusrp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libusrp Last lines of build log: [ 240s] libtool: compile: g++ -DPACKAGE_NAME=\"libusrp\" -DPACKAGE_TARNAME=\"libusrp\" -DPACKAGE_VERSION=\"3.4.5\" "-DPACKAGE_STRING=\"libusrp 3.4.5\"" -DPACKAGE_BUGREPORT=\"open...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libusrp\" -DVERSION=\"3.4.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" "-DHAVE_BOOST=/**/" "-DHAVE_BOOST_THREAD=/**/" "-DHAVE_BOOST_DATE_TIME=/**/" "-DHAVE_BOOST_FILESYSTEM=/**/" "-DHAVE_BOOST_PROGRAM_OPTIONS=/**/" "-DHAVE_BOOST_SYSTEM=/**/" -I. -I../../host/include -I../../host/include -I../../firmware/include -pthread -I/usr/include -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -c db_bitshark_rx.cc -fPIC -DPIC -o .libs/db_bitshark_rx.o [ 241s] In file included from /usr/include/string.h:495, [ 241s] from db_bitshark_rx.cc:29: [ 241s] In function 'void* memcpy(void*, const void*, size_t)', [ 241s] inlined from 'virtual bool db_bitshark_rx::set_bw(float)' at db_bitshark_rx.cc:207:11: [ 241s] /usr/include/x86_64-linux-gnu/bits/string_fortified.h:34:33: warning: 'void* __builtin_memcpy(void*, const void*, long unsigned int)' reading 4 bytes from a region of size 2 [-Wstringop-overflow=] [ 241s]34 | return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); [ 241s] | ~~~^~~ [ 241s] /bin/bash ../../libtool --tag=CXX --mode=compile g++ -DPACKAGE_NAME=\"libusrp\" -DPACKAGE_TARNAME=\"libusrp\" -DPACKAGE_VERSION=\"3.4.5\" -DPACKAGE_STRING=\"libusrp\ 3.4.5\" -DPACKAGE_BUGREPORT=\"open...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libusrp\" -DVERSION=\"3.4.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_BOOST=/\*\*/ -DHAVE_BOOST_THREAD=/\*\*/ -DHAVE_BOOST_DATE_TIME=/\*\*/ -DHAVE_BOOST_FILESYSTEM=/\*\*/ -DHAVE_BOOST_PROGRAM_OPTIONS=/\*\*/ -DHAVE_BOOST_SYSTEM=/\*\*/ -I. -I../../host/include -I../../host/include -I../../firmware/include -pthread -I/usr/include -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -c -o db_tv_rx.lo db_tv_rx.cc [ 241s] libtool: compile: g++ -DPACKAGE_NAME=\"libusrp\" -DPACKAGE_TARNAME=\"libusrp\" -DPACKAGE_VERSION=\"3.4.5\" "-DPACKAGE_STRING=\"libusrp 3.4.5\"" -DPACKAGE_BUGREPORT=\"open...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libusrp\" -DVERSION=\"3.4.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" "-DHAVE_BOOST=/**/" "-DHAVE_BOOST_THREAD=/**/" "-DHAVE_BOOST_DATE_TIME=/**/" "-DHAVE_BOOST_FILESYSTEM=/**/" "-DHAVE_BOOST_PROGRAM_OPTIONS=/**/" "-DHAVE_BOOST_SYSTEM=/**/" -I. -I../../host/include -I../../host/include -I../../firmware/include -pthread -I/usr/include -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -c db_tv_rx.cc -fPIC -DPIC -o .libs/db_tv_rx.o [ 242s] /bin/bash ../../libtool --tag=CXX --mode=compile g++ -DPACKAGE_NAME=\"libusrp\" -DPACKAGE_TARNAME=\"libusrp\" -DPACKAGE_VERSION=\"3.4.5\" -DPACKAGE_STRING=\"libusrp\ 3.4.5\" -DPACKAGE_BUGREPORT=\"open...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libusrp\" -DVERSION=\"3.4.5\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_BOOST=/\*\*/ -DHAVE_BOOST_THREAD=/\*\*/ -DHAVE_BOOST_DATE_TIME=/\*\*/ -DHAVE_BOOST_FILESYSTEM=/\*\*/ -DHAVE_BOOST_PROGRAM_OPTIONS=/\*\*/ -DHAVE_BOOST_SYSTEM=/\*\*/ -I. -I../../host/include -I../../host/include -I../../firmware/include -pthread -I/usr/include -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -c -o db_tv_rx_mimo.lo db_tv_rx_mimo.cc [ 243s] libtool: compile: g++ -DPACKAGE_NAME=\"libusrp\" -DPACKAGE_TARNAME=\"libusrp\" -DPACKAGE_VERSION=\"3.4.5\"
Change in osmo-pcu[master]: Get rid of lots of code only used by tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25093 ) Change subject: Get rid of lots of code only used by tests .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.err File tests/tbf/TbfTest.err: https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.err@503 PS1, Line 503: 0 > why is it not BSN=85 anymore? same below Because last one was wrong (and nobody cared because it's not used in osmo-pcu). This line relates to first RCV_ACK in test_tbf_delayed_release(). In request_dl_rlc_block(), TBF starts sending with BSN 0. The previous update_window() method only used in the test was assuming first_bsn was always SSN-64, which of course didn't make sense here since we are using SSN of 1, 2, etc. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I14d9312cb61534dc97fca83141b9c0cd933c9206 Gerrit-Change-Number: 25093 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 12:27:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmo-pcu[master]: Fix typos in comments documenting fsm st chg macro
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25095 ) Change subject: Fix typos in comments documenting fsm st chg macro .. Fix typos in comments documenting fsm st chg macro Change-Id: I8f1cef5810c84441f7d6d2fbe5b3106e0ae71b69 --- M src/nacc_fsm.c M src/tbf_fsm.h 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/25095/1 diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index d2702d4..9a5f5b5 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -53,7 +53,7 @@ [NACC_ST_DONE] = {}, }; -/* Transition to a state, using the T timer defined in assignment_fsm_timeouts. +/* Transition to a state, using the T timer defined in nacc_fsm_timeouts. * The actual timeout value is in turn obtained from conn->T_defs. * Assumes local variable fi exists. */ diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h index 1874bc3..9d2919d 100644 --- a/src/tbf_fsm.h +++ b/src/tbf_fsm.h @@ -57,7 +57,7 @@ }; extern const struct osmo_tdef_state_timeout tbf_fsm_timeouts[32]; -/* Transition to a state, using the T timer defined in assignment_fsm_timeouts. +/* Transition to a state, using the T timer defined in tbf_fsm_timeouts. * The actual timeout value is in turn obtained from conn->T_defs. * Assumes local variable fi exists. */ #define tbf_fsm_state_chg(fi, NEXT_STATE) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25095 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8f1cef5810c84441f7d6d2fbe5b3106e0ae71b69 Gerrit-Change-Number: 25095 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange
Change in osmo-pcu[master]: tbf: Merge handle_ack_nack() into rcvd_dl_ack()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25094 to look at the new patch set (#2). Change subject: tbf: Merge handle_ack_nack() into rcvd_dl_ack() .. tbf: Merge handle_ack_nack() into rcvd_dl_ack() There's no real use in having those 2 methods separately, and only adds complexity. Let's merge it to have 1 TBF code path handling DL ACK/NACK. Change-Id: I546d2e46bda96a2f551b28673464e57831c71828 --- M src/pdch.cpp M src/tbf_dl.cpp M src/tbf_dl.h M tests/tbf/TbfTest.err 4 files changed, 9 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/25094/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I546d2e46bda96a2f551b28673464e57831c71828 Gerrit-Change-Number: 25094 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Get rid of lots of code only used by tests
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25093 to look at the new patch set (#2). Change subject: Get rid of lots of code only used by tests .. Get rid of lots of code only used by tests There are 2 methods "rcvd_dl_ack()" in osmo-pcu code. One is used by osmo-pcu itself, and the other is only used in tests. Changing the tests to use the same method as osmo-pcu allows removing the second one, and with it, a lot of code and complexity out of osmo-pcu. Change-Id: I14d9312cb61534dc97fca83141b9c0cd933c9206 --- M src/decoding.cpp M src/decoding.h M src/encoding.cpp M src/encoding.h M src/tbf_dl.cpp M src/tbf_dl.h M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err M tests/types/TypesTest.cpp 9 files changed, 129 insertions(+), 127 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/25093/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I14d9312cb61534dc97fca83141b9c0cd933c9206 Gerrit-Change-Number: 25093 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25090 to look at the new patch set (#2). Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA .. tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA Same information is available under ul_tbf->m_rx_counter. Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559 --- M src/tbf.cpp M src/tbf.h M src/tbf_ul.cpp 3 files changed, 15 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/25090/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559 Gerrit-Change-Number: 25090 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_DL_ASS
Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25061 to look at the new patch set (#2). Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_DL_ASS .. tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_DL_ASS The flag is only used to print some non interesting stuff, let's drop it in order to simplify code. We can add later whatever we want in the new shiny FSM. Change-Id: I13f92f058c219f230d57b3c00b8ae1d187603813 --- M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl_ass_fsm.c M tests/tbf/TbfTest.err 5 files changed, 14 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/61/25061/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I13f92f058c219f230d57b3c00b8ae1d187603813 Gerrit-Change-Number: 25061 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: replace dl_ass_state with osmocom FSM
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25060 to look at the new patch set (#2). Change subject: replace dl_ass_state with osmocom FSM .. replace dl_ass_state with osmocom FSM Related: OS#2709 Change-Id: Ia33418478e17986a316ffda48b091030f53fa371 --- M src/Makefile.am M src/encoding.cpp M src/encoding.h M src/gprs_rlcmac_sched.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp A src/tbf_dl_ass_fsm.c A src/tbf_dl_ass_fsm.h M src/tbf_ul.cpp M src/tbf_ul.h M tests/alloc/AllocTest.err M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err M tests/types/TypesTest.err 16 files changed, 100,488 insertions(+), 229 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/25060/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia33418478e17986a316ffda48b091030f53fa371 Gerrit-Change-Number: 25060 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_UL_ASS
Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25059 to look at the new patch set (#3). Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_UL_ASS .. tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_UL_ASS The flag is only used to print some uninteresting stuff, let's drop it in order to simplify code. We can add later whatever we want in the new shiny FSM. Change-Id: I20aa7f83cc4f32de129e64c74a91745b983a7b16 --- M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_ul_ass_fsm.c M tests/tbf/TbfTest.err 5 files changed, 13 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/25059/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20aa7f83cc4f32de129e64c74a91745b983a7b16 Gerrit-Change-Number: 25059 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Replace ul_ass_state with osmocom FSM
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 to look at the new patch set (#5). Change subject: Replace ul_ass_state with osmocom FSM .. Replace ul_ass_state with osmocom FSM Related: OS#2709 Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 --- M src/Makefile.am M src/encoding.cpp M src/encoding.h M src/gprs_rlcmac_sched.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_ul.cpp M src/tbf_ul.h A src/tbf_ul_ass_fsm.c A src/tbf_ul_ass_fsm.h M tests/alloc/AllocTest.err M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err M tests/types/TypesTest.err 15 files changed, 100,530 insertions(+), 208 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/56/25056/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 Gerrit-Change-Number: 25056 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Replace ul_ass_state with osmocom FSM
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25056 ) Change subject: Replace ul_ass_state with osmocom FSM .. Patch Set 4: (5 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp@a767 PS4, Line 767: s X2000, > why was this removed? (maybe it makes sense to do this in a separate commit > and explain it there?) Timer X2000 is moved inside the new FSM, so it's not handled by this pcu-specific mechansim anymore, but using usual osmocom FSM timer callback. https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp@967 PS4, Line 967: osmo_fsm_inst_update_id(tbf->ul_ass_fsm.fi, buf); > Why give two separate FSMs the same ID, wouldn't it be better to add some > kind of suffix that differ […] No need for that, the name of the FSM (which is different for the 2 types) always show up next to the id, so it's totally fine. Having same ID actually helps in quickly relating different FSMs to same TBF. https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h File src/tbf_ul_ass_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@32 PS4, Line 32: TBF_UL_ASS_EV_CREATE_RLCMAC_MSG, /* Scheduler wants to gen+Tx the Ass (rej): data=tbf_ul_ass_ev_create_rlcmac_msg_ctx */ > (line length) I prefer keeping comment in one line even if it's a few chars too long. https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@52 PS4, Line 52: fi > (Same for "replace dl_ass_state with osmocom FSM" patch) no, the comment is fine. "the_pcu" is actually a global variable which always exists :) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c File src/tbf_ul_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c@306 PS4, Line 306: bool tbf_ul_ass_rts(const struct gprs_rlcmac_tbf* tbf) > assuming rts means ready to send? would be good to add it as comment […] It's common in different osmocom projects like osmo-bts. I'm already using same sort of naming for other FSMs such as the NACC one. These functions are basically used from the scheduler to know whether a related message is waiting to be preparted and sent. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 Gerrit-Change-Number: 25056 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 11:45:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25090 ) Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25090/1/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25090/1/src/tbf.cpp@1005 PS1, Line 1005: No uplink data received yet| > both cases print the same message? Thanks for mentioning, it's of course wrong. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559 Gerrit-Change-Number: 25090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 11:30:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmo-pcu[master]: replace dl_ass_state with osmocom FSM
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25060 ) Change subject: replace dl_ass_state with osmocom FSM .. Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c File src/tbf_dl_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@72 PS1, Line 72: // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? > unresolved FIXME That's expected, it wasn't there in previous code I created this from, but while looking at it I saw we may want to use this later. This is left as an improvement for the future. https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@88 PS1, Line 88: // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? > unresolved FIXME Same as above. https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@93 PS1, Line 93: new_dl_tbf = ms_dl_tbf(ms); > previous code had if(ms) around this. […] Yes, I removed it on purpose while reworking the function in the new place, since a TBF is alweays granted to have an MS. That's a consequence of another big refactoring I did some months ago, and I'm slowly removing this kind of checks from code when I see them. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia33418478e17986a316ffda48b091030f53fa371 Gerrit-Change-Number: 25060 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 11:26:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Merge handle_ack_nack() into handle_ack_nack()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25094 ) Change subject: tbf: Merge handle_ack_nack() into handle_ack_nack() .. Patch Set 1: (1 comment) LGTM besides commit message https://gerrit.osmocom.org/c/osmo-pcu/+/25094/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25094/1//COMMIT_MSG@7 PS1, Line 7: handle_ack_nack rcvd_dl_ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25094 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I546d2e46bda96a2f551b28673464e57831c71828 Gerrit-Change-Number: 25094 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 08:31:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Get rid of lots of code only used by tests
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25093 ) Change subject: Get rid of lots of code only used by tests .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.cpp File tests/tbf/TbfTest.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.cpp@263 PS1, Line 263: #define RCV_ACK(fin, tbf, rbb) do { \ this macro is long and hard to read. can you convert it to a function? https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.err File tests/tbf/TbfTest.err: https://gerrit.osmocom.org/c/osmo-pcu/+/25093/1/tests/tbf/TbfTest.err@503 PS1, Line 503: 0 why is it not BSN=85 anymore? same below -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25093 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I14d9312cb61534dc97fca83141b9c0cd933c9206 Gerrit-Change-Number: 25093 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 08:27:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Move timer X2001 to tbf_fsm
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25092 ) Change subject: Move timer X2001 to tbf_fsm .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib8ab2f7397ad05c6fcd5dd74af55a1e2c56e1463 Gerrit-Change-Number: 25092 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 08:20:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Replace ul_ass_state with osmocom FSM
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25056 ) Change subject: Replace ul_ass_state with osmocom FSM .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c File src/tbf_ul_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c@219 PS4, Line 219: Plt Pkt? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 Gerrit-Change-Number: 25056 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 08:12:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25090 ) Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_UL_DATA .. Patch Set 1: (1 comment) *amount of flags slowly shrinking with each patch* https://gerrit.osmocom.org/c/osmo-pcu/+/25090/1/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25090/1/src/tbf.cpp@1005 PS1, Line 1005: No uplink data received yet| both cases print the same message? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1d993117c7daa2609b132c2d0fd748e0338ef559 Gerrit-Change-Number: 25090 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 08:09:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_DL_ASS
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25061 ) Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_DL_ASS .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I13f92f058c219f230d57b3c00b8ae1d187603813 Gerrit-Change-Number: 25061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 08:06:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: replace dl_ass_state with osmocom FSM
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25060 ) Change subject: replace dl_ass_state with osmocom FSM .. Patch Set 1: (6 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.h File src/tbf_dl_ass_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.h@32 PS1, Line 32: Ul Dl? Same 2x below https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.h@38 PS1, Line 38: downlonk downlink https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c File src/tbf_dl_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@72 PS1, Line 72: // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? unresolved FIXME https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@88 PS1, Line 88: // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? unresolved FIXME https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@93 PS1, Line 93: new_dl_tbf = ms_dl_tbf(ms); previous code had if(ms) around this. just to be sure, this was removed on purpose? (I wonder why it was there in the first place.) https://gerrit.osmocom.org/c/osmo-pcu/+/25060/1/src/tbf_dl_ass_fsm.c@190 PS1, Line 190: Plt Ul Pkt Dl? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia33418478e17986a316ffda48b091030f53fa371 Gerrit-Change-Number: 25060 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 08:02:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Replace ul_ass_state with osmocom FSM
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25056 ) Change subject: Replace ul_ass_state with osmocom FSM .. Patch Set 4: (3 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h File src/tbf_ul_ass_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@50 PS4, Line 50: assignment_fsm_timeouts > where is assignment_fsm_timeouts defined? (I can't find it, maybe this has > been renamed? it's also u […] (Same for "replace dl_ass_state with osmocom FSM" patch) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@52 PS4, Line 52: fi > fi is passed as parameter, so this should be "the_pcu"? (Same for "replace dl_ass_state with osmocom FSM" patch) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@62 PS4, Line 62: MS_ANR_EV_CREATE_RLCMAC_MSG > can't find this, do you mean TBF_UL_ASS_EV_CREATE_RLCMAC_MSG? (Same for "replace dl_ass_state with osmocom FSM" patch) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 Gerrit-Change-Number: 25056 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 07:36:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_UL_ASS
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25059 ) Change subject: tbf: Drop unuseful flag GPRS_RLCMAC_FLAG_TO_UL_ASS .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20aa7f83cc4f32de129e64c74a91745b983a7b16 Gerrit-Change-Number: 25059 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 07:25:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf: Reimplement rlcmac_diag() and make it available from C
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25058 ) Change subject: tbf: Reimplement rlcmac_diag() and make it available from C .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3ad66f9f3f4d55d11da3a3b8b38656ae2dd50603 Gerrit-Change-Number: 25058 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 07:21:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Replace ul_ass_state with osmocom FSM
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25056 ) Change subject: Replace ul_ass_state with osmocom FSM .. Patch Set 4: (7 comments) The only problem I see is having two FSMs with the same ID seems strange, otherwise just some cosmetic comments, rest looks good! https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp@a767 PS4, Line 767: s X2000, why was this removed? (maybe it makes sense to do this in a separate commit and explain it there?) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf.cpp@967 PS4, Line 967: osmo_fsm_inst_update_id(tbf->ul_ass_fsm.fi, buf); Why give two separate FSMs the same ID, wouldn't it be better to add some kind of suffix that differentiates them? https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h File src/tbf_ul_ass_fsm.h: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@32 PS4, Line 32: TBF_UL_ASS_EV_CREATE_RLCMAC_MSG, /* Scheduler wants to gen+Tx the Ass (rej): data=tbf_ul_ass_ev_create_rlcmac_msg_ctx */ (line length) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@50 PS4, Line 50: assignment_fsm_timeouts where is assignment_fsm_timeouts defined? (I can't find it, maybe this has been renamed? it's also used two more times in other comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@52 PS4, Line 52: fi fi is passed as parameter, so this should be "the_pcu"? https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.h@62 PS4, Line 62: MS_ANR_EV_CREATE_RLCMAC_MSG can't find this, do you mean TBF_UL_ASS_EV_CREATE_RLCMAC_MSG? https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c File src/tbf_ul_ass_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/25056/4/src/tbf_ul_ass_fsm.c@306 PS4, Line 306: bool tbf_ul_ass_rts(const struct gprs_rlcmac_tbf* tbf) assuming rts means ready to send? would be good to add it as comment (unless this is a very common abbreviation that I just didn't see much yet) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id414eafe9c04a9a8759c6fb1a483bf2ee093a4d2 Gerrit-Change-Number: 25056 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Thu, 29 Jul 2021 07:18:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment